diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2024-01-30 17:58:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-30 17:58:48 +0100 |
| commit | 6524f20de4c1b49ab510aa1b087f6bac27acd546 (patch) | |
| tree | d8d7d4532faba411fde01188da85664b75ca8bb1 | |
| parent | Merge pull request #12846 from german77/mii_const (diff) | |
| parent | cmake: prefer system oaknut library (diff) | |
| download | yuzu-6524f20de4c1b49ab510aa1b087f6bac27acd546.tar yuzu-6524f20de4c1b49ab510aa1b087f6bac27acd546.tar.gz yuzu-6524f20de4c1b49ab510aa1b087f6bac27acd546.tar.bz2 yuzu-6524f20de4c1b49ab510aa1b087f6bac27acd546.tar.lz yuzu-6524f20de4c1b49ab510aa1b087f6bac27acd546.tar.xz yuzu-6524f20de4c1b49ab510aa1b087f6bac27acd546.tar.zst yuzu-6524f20de4c1b49ab510aa1b087f6bac27acd546.zip | |
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | externals/CMakeLists.txt | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index eb26fbfd8..f4b64544f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -322,6 +322,10 @@ if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) find_package(xbyak 6 CONFIG) endif() +if (ARCHITECTURE_arm64) + find_package(oaknut 2.0.1 CONFIG) +endif() + if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) find_package(dynarmic 6.4.0 CONFIG) endif() diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 42355716c..d49a2e43e 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -14,16 +14,17 @@ set(BUILD_SHARED_LIBS OFF) # Skip install rules for all externals set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL ON) -# xbyak +# Xbyak (also used by Dynarmic, so needs to be added first) if ((ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) AND NOT TARGET xbyak::xbyak) add_subdirectory(xbyak) endif() -# Dynarmic +# Oaknut (also used by Dynarmic, so needs to be added first) if (ARCHITECTURE_arm64 AND NOT TARGET merry::oaknut) add_subdirectory(oaknut) endif() +# Dynarmic if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) AND NOT TARGET dynarmic::dynarmic) set(DYNARMIC_IGNORE_ASSERTS ON) add_subdirectory(dynarmic) |